cleanup in DB creation scripts