Removed unnecessary comments and code, allow for replacement of endpoints and deletion of endpoints