remove deprecated ply and such...