more cleanup and add to recent