Removed some template passing of choice keys
Removed outdated POST handler

Nothing calls this anymore
Update pickup system

Fixes choice-key attack