-commented out unused import and obsolete method call