removed all the custom database stuff