cleanup on upload/transport, tidying up models i had been neglecting