This cleanup needs some cleanup. Remove dead code commetns. Remove no-longer-applicable comments.