cleanups and next steps