Cleanup old methods in place for new controllers