Remove extraneous endpoints