removing amazon dependency