Use conditions instead of commented lines for build