more cleanup on Plugin related to report