some small cleanup of left-overs