Removed do_link_cleanup attribute
Added a todo item