Cleaned up StaticServer