Remove Lines 23 and 27