Remove unnecessary elif