more guide cleanup