Removing one more v2 thing