Make removal blocking (and simplify some steps)
Fixed documentation