Code cleaning

Removed obsolete code
Merge pull request #139 from jehope/adminMods-10

Code cleaning