Cleaned up some TODO's

Old links needs to be updated to the new URL structure