Clean up

Almost ready for production.  Cleaned up and removed development/test
scripts.  Still need to dust off restore method.  Before local-only BETA
release.