Remove double underscores