Major error cleanup.