Remove addshore

Change-Id: I8f7a694e89206aa7b7c712e6cd45e4fc9bdb912a