Clean up endpoints some more