Removed conditional v1 logic