we should be able to get rid of lines 94 and 95, right?