Remove remaining unused code