Some more cleaning up.