Minor fixes

Removed dead code
Fixed dockblocks
Removed error suppression