Updates to namecleaner and predb handling