configure unite; cleanups