removed unused stuff
mapping