Consider removing commented out code in a future commit :) .. NB is full of it, but if someone reminded me to do it that would be nice.