Cleanup/fixed PlayerPrefab after merge