rev 37: Cleanup