Refactor, remove the product related class and properties files