code cleanup; commented out potentially harmful code