Delete legacy code