Removed unused files and updated services.yml