clean organisation and add delete procedures