cleared solution parts from the code for the unresolved branch

Change-Id: If29db106927009a99a618b086a32ee1a970d26c5