Remove out-of-date info
Avoid whitespace in dir name