Added the ability to remove singletons on initial parse