some cleaning up before the 2.03 release