Improves interaction recording and removes outdated code