adapt to mapping changes, cleanup

Ok. Let leave as is. We have TOSO and fix it later. :)
I have also troubles with building of python module with setup.py. I'll see this later.