Fix cleanup dir
Use node_insert and node_upload hooks