Better just to remove code than comment it out. I've tried to only comment out stuff that is temporarily removed (like a feature that is broken but will be fixed later) and otherwise just remove it.