Monday cleanup in Tangi

Monday cleanup in Tangi