Comment out obsolete S3 stuff