Remove requirement for hy-mode