Clean up configure block