Add some change to deviceConfiguration layout
Remove reference of deleted ressources