Removed unused code related to trust
Added device family