Added yaml cmd + cleanup