Cleanup and mark next steps