Some cleanup of backing store methods