Removed unused class
Removed unused class
Removed unused class
Reverted change to Shooter encoder, removed unused imports