Clean up more $Id$ mess