some cleanups and prep for v4l2 support in new xpdr