clean-up old dead code