Removing unused imports
adding constants
temporary removing stream service dependancies
fixing a bug in stream definition adding