mysql fix + revert changes + remove unused import