improved line-removal.
rename properly