Yaml now throws an exception if file not found
Did not need that conditional, since it is handled in Yaml now
Removed full qualified names where they are not needed