removed some lines "marked" for removal