more endpoint cleanup