Cleanup status transition

fixes #5432