implement singletonSet, remove comments and other kruft