rm some todo; commend out some todos that should be done later