Changed the way we deal with dropped enrollment to prevent zombie key issues.

Braaaaaaainnnnnsssssss