Clean up X3 panel mess

Change-Id: If9d3ef4e35129333123b2576e904dcf21010db32