streams

Removing unused hardcoded values

Initial commit (cleaned)