Removed duplicates and unused files