Trimmed down the non-shooter code