Remove hard limit on number of top level units
Remove unnecessary assertion