code cleanup
use linkst updated API