Only two compulsory sports as Commonwealth Games set for major revamp