Remove more superfluous stuff