[jaiguru] branch cleanup