xt1060: cleanup

Change-Id: Ie49fcb185d58897bd8a9732f775751e0d1de9a65