- use full paths
- cleanup