tidy up server code and removed files from source control
tidy up client-side code