dotcase: wouldn't you believe it? MOAR cleanup!??!

(its been a long time coming)

Change-Id: Ibf9aa184993941104d0e7b66981007773f3448fc