remove unneeded / conflictive lines