Deleted conflicting files for client/application controllers