Cleaning up endpoints