Clean up

Removed obsolete code and comments, disabled injections (still available
if needed)
Re-enabled validation in order to fix all issues