update for refactor
cleanup remove next remove error handling