cleanup - match submitted patch