got rid of db redundancy