shine & polish, remove dead code