Cleanup: Removed some legacy code