security is not really needed in the project - but cleanup done anyway
Merge pull request #261 from frastel/security-cleanup

security is not really needed in the project - but cleanup done anyway