Remove primary database correctly
Extend stat output on REST service