Merge "clean-up dead-code" into kraken