Resolves STREAMS-112

added timestamp logic
removed code and logic deprecated by STREAMS-116