Another complete cleanup to get rid of history