Remove old, dead code