got rid of 6 ~unused state constraints