reverted last commit

reverted last commit because I want to differ named context implementation
plus I think is better to do it in a branch
removing traces