Address other comments

Remove duplicate popstate event binding