Cleanup option handling