More worthless checkin (mostly cleanup of the last one)