Remove deprecated features and fix API test