more cleanup and db root user/password update