Little bit more cleanup in phase4.