removed sql_query and similar totally, fix #1