tidy up some u13 code
more u13 tidy up