Also clean up Boehnli.