Fixed #228 by deleting 900 Units at a time