shooter: cleanup for shooter-common

Change-Id: I548ab373c182d593185421704c77d614d2596f7a