Cleaning up configure