Provider was not being removed from the class map because it was using the wrong key. D'oh. Also a little cleanup. Change-Id: I318e8b1a265318ac1474e0a7f14f27f89f357505