master: 314295361a2eef80edf1001f2c3e66850cca0149 Cleanup