cleanup of git repo, modifications to ensure database builds correctly.