#1199 - Removed some unused code in ProductOptionValueDaoImpl and refactored