remove old methods and recategorize