Apparently I didn't remove the dependency on location.py like I thought I did. Anyway, cleanup.