Feature/not me2

We should be removing this message as per #349 so I wouldn't rely on it.