Use proper path for refresh calls
Remove unneeded dummy data
Remove unused, commented code