Removed unused libraries and WSServer until we need it
Indented code