am d908822d: Merge "clean-up dead-code" into kraken