Merge "Owner,Delete files-removing useless assignments"