Uniform location fetching + cleanup