More Heartbleed cleanup