Cleanup
Mysql refactoring