Eriks cleanup of ultrasonics according to Ytai's suggestions
Works good