Remove manual emit on status