#if 0... cleanups
cbp