* Remove use of embedded sources
