extend and clean up infringement class