Removed some old deprecated stuff.