FIX :: Cleanup manifest and OrmUri