Removed all legacy code