some fixes to sequence of removal and some safety for get call