Remove more stuff that we don't need any more