Added a specific cleanup when deleting cluster plan or midifying it