Added extra cleanup for encryption migration table