Added remove category with logics in other places to suit reqs.