Remove leftover dead code