Remove dead CALibration handler
Continue initial dev