removed proxy.js
some refactoring