Uncommented several important modules and removed patches