More odbase cleaning