Remove whiskers support for now