Removed legacy methods and classes