Clean up and reconcile with work version