Remove s3 from test environments etc