Revert "-record additional functionality"

This reverts commit e335813b42b03a1cce6240c9cd7163276abe3a9c.