Remove more deprecated stuff