renaming, remove singleton