#25 - cleanup