Change product name and remove unused code