Recipe rework and remove depends and more fixes