Final cleanup before deploygin and testing.