Remove unnecessary cases and rely on default