shooteru: cleanup for shooter-common

Change-Id: Iccbb6d7c149ee561ca719fb92597d346c86b6268