Remove more references