Remove waiting sate & simplify