Removing unused files.
Merge branch 'service-merge'