Removed redundant match statements left over from an old implementation