removed some old code