Codebase clean up make products default controller