remove old methods and commit the functional methods