Removed support for Hatch