Removal of problematic round options