Merge "Removed some b/c code from file backend"