- Minor cleanup; removed some temporary testing code.