Delete imrovement and bug fix