Lotsa cleanup involving Progress observers