Cleaning up and Fix in PickAndPlace