Clean up options handling