More cleanup, add section for _pickup_options and such