[TASK] Clean up sql definition