removed commented code and work proxy