Brandon: Cleanup in prep for handover.