delete cruft
add locations