cleanup and recorder spinning fix