Cleanup ugly merge