Cleanup, revert some variables.