Configure stuff and unused config vars removed