UX improve; cleanup code; walk with user removing