(maint) Remove commented out code