Clean up.  Added ability to spin up server without db