Removed some old code