Remove more old code