Bug 950224: Remove unnecessary Endpoints