Remove unused functions, rename 'instance' to 'singleton'