get away from PropertyUtils, use spring native stuff + code cleanup