Wixel coms cleanup