Remove unnecessary except