utils initial cleanup