Fix removing locations