removed v1 api special cases