! Missing SMF check
! minor cleanup