Remove useless code for non-unified devices

Change-Id: Ie3f308a4dec6f051aa9241391681cd9fcb73096a