Finish upgrading clearing to 4.0wip