Updates from review
Suppress MIMA error for removed package private classes