Merge "Delete legacy code"