Stripping lines without library, reverts 513cf004b3