Removing amazon code from dev branch