BAR - Removed code commented out in previous commit