Remove singleton accessor, since clients are now injected