Clean up c3eb46596a8afabcdb0b48808b9a7b7f46359528