Fixing comment
Remove path
Cleanup and adding problems