Cull some apparently unused code