Removed (now) spurious state dependencies as suggested by Maxime