- Removed legacy code