@smichr , why are we removing these lines?