Cleaning up code. Removed unused ServerService