Remove a couple of things that aren't generic