Change link creation
Remove commented lines and remove js