Kill off some unused code that was wasting several k, as noticed by