server- working: remove commented portions form most of the code