LP#1882937: Comment and dead-code cleanup