remove proxy aspect
Merge branches 'try2' and 'try3'
remove unessisary code