Reporter changes and stage file cleanup