Assets cleanup and update

Change-Id: I2ae5c59aa0453b14a048b32d8b91505ecec8291e