(master) cleanup linking hacks