API cleanup

Remove old APIs/ Non-existing.