Remove state to add compatibility with older API