First pass
Removed odd lines