yr: cleanup