added auto-remove in non-consolidation method