Cleanup debug changes.
Merge pull request #335 from RomanZhilich/new_store_picking_algorithm

Cleanup debug changes.