Removed legacy code