Remove highly half-baked support for dynamic endpoints, and cosmetic.