Target .Net Framework back to 2.0 and remove commented methods