us5250 - unwip and tidy up