Remove redundant status capturing