remove more config removals (must revisit)