MySQL support, cleanup