Continued clean up.