Cleaning up mysql leftovers
Merge branch 'Juan'