Removed unused object, erroneous comments