Finish removing system of index-remove.