[HOTFIX] Removed inherited state and set global state deprecated