#62: cleanup