Removed a few server calls. Added comments