I only leave code commented out if I'm not sure about deleting it - if you think it's ok to delete I will.