fix bug: took wrong data from internal map
removed not needed attributes
doc