ave: cleanup