Final update and cleanup