removed some code, do we need that?