Removing the service.properties dependency