cleanup
1.1 working for MYSQL
1.1 working for MYSQL