shooter: cleanup for shooter-common