cleanup following code