clean up the way things are deleted and remove matching shims