Clean up option validation