shaving, logger, SComplex factory cleanup