partial include clean-up pt 1