need better db cleaning