remove duplicate unnecessary list of variable instances

Huge memory waste. There was two copies of the variable. One in hashmap another one in the list.
The latter can be easily extracted from the former in no time.

Code enhanced