Some cleanup; Still issues when paused (video frame is recorded)