cleanup on messy merge