cleanups, rename to usch.h