Remove unnecessary completion cases