Fix comments and remove use of deprecated class