Removed some old, dead code