dead code cleanup and comment cleanup