beyondx: clean up this mess

Change-Id: Id47eedfaeed354b48c519156b83ca78a0708d9be
6 files changed