Removed some old code that was not used