fixed some delete issues