Restored two debug statements for event handling, removed the Amazon tests because the keys are bad