merged sql cleanup scripts