[SQL] Cleanup