Remove files
Improve location calculation.