Clean-up for new fork.