added codes for cleaning