streams
removed some unused code