Option to remove singletons