remove unneeded singleton enforcement