Merge s3_bucket with s3_api and remove unnecessary definitions