Cleaned up repo, removed un-needed sections in server code