removed some deprecated methods and comments