removing tmp code