Implemented match and alternate removal