Removing v1 logic