fix setup glitch
cleanup