[IPHONEAPP-642] removed TODO comments updated other comments