Configure: clean away temporary section of code