Import fix and remove an unnecessary function for boto_iam