Getting further with deleting resources. Still not complete
Release preparation