shooteru: cleanup for shooter-common