Retire takeaway

This branch builds upon changes from the remove_placements branch.  It should not be merged until that one is complete.  It is here for discussion.
got rid of the update_a_takeaway method because it was tightly coupled with this test method anyway and made it less readable