Removed some old unwanted code