Cleanup and overall update