Clean up: pass #4