got rid of some lazy state