@geometrikal - could this code just be removed rather than commented out?