Follow up to previous commit, a couple of deletions