Removed more stale code