concurrent queue refactor
cleanup