Stripped out ancient code
More old code removed
Migrate Pickup to draft
Merge pull request #30 from smarthimandrew/merge-pickup-to-draft

Merge pickup to draft