Squashed code to cleanup history with some internal data