- removed some old code