got rid of useless hash map access.