add: fix ciclical
clean 61 and drop decorator