Huge cleanup from Assets v2