Adding autoharden and associated cleanup.