Further cleaning up.