Changes made by Will Carlton (wacarlton@gmail.com).
Remove meter location for now.