Cleanup
FIx path static path bug