some cleanup for multi_instance mysql

Change-Id: I628f45907b2ee54edc2fd0e66ed7c54bd47a7ca4