Deleted more unused code