removed comments and dead code.