Fix linking
Remove deprecated functions