Cleanup DB scripts after install feedback
Various performance updates