Some cleaning up.