Remove commens
Reset state
Remove under development tests emails
Scrutinizer patch