change on paths and remove a few lines of code.