Added EndPoint Removal