Minor clean-up and reshuffle
Remove deadcode
Removed deadcode
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer