more mysql cleanups