Remove endpoints and move them to the default loader