Upgrade paradise.
Remove unneeded changes and code.