Removed unused files and modified config