Cleanup; removed most debug statements