Removed functionality to have internal states, will add back in future