code cleanup
Merge branch 'master' of https://github.com/mmmavis/temp-collusion-db-server