Cleanup and Record instantiation removed