implemented params & tokens removal