Cleanup around linking.