removed outcommented sql