Removed non SAF related files