Removed old pickup and drop functions