WIP: removing deprecated features