Continue clean up work