Fix for shooting, remove unused params