Removed/adapted all metaclass25 imports