Hotfix
Should be final script fix
Cleanup sample index