Feature/remove deprications refactored blocks