Revert "Add recorders"

Unmerged add_recorders branch from master