removed reference to singleton
removed old.index files
cleaned up qs