more clean-up of unused code