Clean up unused code from copy and paste
Remove sort keys
Remove hard coded api uri