removed db stuff