removed dabase stuff