clean-up stale code