extra clean-up for two commits ago