Remove support for V1