Some clean-up for xvon