remove references to singleton stuff