more location cleanup

Signed-off-by: Stuart George <sgeorge@mega-tokyo.com>