Fix pickup and firing routines and remove encoders