MAINT: Remove commented code completly