Revert "Fixed merge issues and state issues"

This reverts commit 1f685a7c26c13be689e3d9308d1a4d8a2769067c.
Revert merge