Clean up the LinkedData/LinkedData2 mess