Cleanup from merge