improve initial cleanup