Removed some more test code and started working on the service