Fixed T6 and T7 failures

Fixed T6 and T7 failures
cleared the unused imports