Fix Recorder
remove deprecated stuff