#62 - cleanup