Remove with_default_scope method usage