Removed unnecessary config parameter.
Removed duplicate code.
Revert Record helper functionality.