cleanup and removed SkipServeIndex as it has no real use