Revert "Final Version Stateful"

This reverts commit 89bce0b3734a6a3b9c373b4f263316d838cc5614.
Fixed timeline - light conflict