cleanup, removed 9 unused map vars