remove init commit() + new query method