remove last traces of demo folder
add guard and yard helpers