itravis, more cleanup