minor clean
merge
goalfollow and delete in empty scene
merge