Removed unused files, aliases