minor, comments and dead code