remove decorate functions