switch to specific image classes to avoid recursion. Remove old incompatible migrations