Removed deprecated features ready for 0.5