Time to remove commented out functions (a pet hate of mine!) :)