Cleaned up CF hash retrieval more