Lots of bugfixes and cleaning

Caloris\Database class removed