Con-fig and clean-up