Remove unused lib
Create pending new report in new class to reuse