cleanup and continued work