Recorder cleanup
Merge pull request #1108 from pdalpra/cleanup

Recorder cleanup