cleanup
Move asset tracking to manifect model