Remove obsolete imports
A bit more documentation
More scrutinizer patches