Remove Amazon Add product functionality and some code review changes.