Clean up configure option