Add missing dep
Remove redundant dep
Remove redundant dep
Tidy up deps
Tidy up deps
Tidy up deps
Tidy up deps
Deprecate API singleton