Clean up for 0f115f43e5eecb3d8559ca1929221ac1ed26d784