removed the broken db stuff