Remove horribly verbose evil initial state code