Start of the clean up for the next release..

2004-03-10, grim