Revert "Cleanup start fact"

This reverts commit 008d14c04b6d7b3f9e9914494c1abd215801047d.