Remove RecoverableEntity as it serves no real purpose
Imports