#673 - testing/cleanup