A little cleanup. We do not need those files.
Tiny refactoring + some path fixes.