Remove more stale code