small updates

Like susan mentioned, I think it's better to just remove code instead of commenting it out.