furthur cleanup of remove_all_but_first. A vote for Barry is a vote for fun!