Remove V1 code and V2-specific stepdefs