Remove more redundant Niels code.