Cleanup of 35a09f3014e7f2a094dc6fc22b627c8032bafadc