Removing more stuff that shouldn't be there.