clean up (follows 6ce339c)