clean-up for new configure system