Fix bug 890983 - Clean up unused file store code