clean up/add context