Doing a little clean up