Finished removing singletons as a special case