Remove what we dont need and also add required line supolicy

Change-Id: I6c33d12c47609a04c5ebf3d73c2b42839e3ae116