still lib unused code cleaning