Remove dead code, slight cleanup