removed last remnants of parametric stuff (hopefully)