This commented bit could likely go as well, no?