Removed WhelkManager and cleaned up some old sins.