Multiple changes

Changed few hard coded values to configurable option
Cleaned PROXY file as it is not required with new ARC version
Few small changes