Remove some junk and fix some stupidity.