[CLEANUP] Code cleanup in ext:reports