Started removing old script and state functionality