remove some unused code, and reuse the helper method now the helper is available