Pick up removal is working

Removal of all pick-ups is working. Need to make it work on an
individual basis