Loadtest cleanup

@snopoke may be interested, but anyone can merge