Fixing RecordingTask, cleanup
Merge