Added service.properties
Cleanup