code cleanup; comment out log spam