A lot of cleaning, endpoint bug still persists