Amazon - remove testing code