GPII-128: code cleanup

Removed unused demands, and defaults. Since the demands were no longer needed, there is no longer the need to put the gpii-discoveryTool context into the static environment. This has also been removed.