issue #20524: cleaned up sql files