removed RoF and related code.
Merge branch 'CleanUps' of https://github.com/regneq/Server into CleanUps