Clean up made in previous patches.