Added COM removal