More GOAP + Removed old scenes