Removed unused code from the endpoint plugin