Removed the dependency on SAF