Removed lines and added strigs

Changes to fit the new commits

Change-Id: Ic67b07db4652e1dbf971723582cbe6e8293d76d7