clean up data structures per conversation with Mike on 9/8/14