fix path and cleanup