[Hardware] Cleanup for 5180