Removed dependency from SQL