CHANGED removed some old code