cleanup and add new activity