Starting a cleanup, deleting functions not relevant to stream, commenting code.