few small fixes, and remove obscure methods from database class