JFUSION-149 #comment removed call to unneeded classes to be deleted later.