Merging with admin.
Deleting unused files.