Remove dead code, etc.