Removed old remainder of singleton code