DEVEN-175 cleanup status-controller