cleaned up merge leftovers