ProductController cleanup