Cleanup filterOptionsS3, remove unnecessary parameters, update comments and todos.