removed some unused items
added run location macros