Get rid of stuff that should be in common as it applies to all variants