[m12366] More cleanup and ancient SQL zipped up