<pulkit/riya> bug removal continues