Removed solarEnvelope2 and solarFan2

Removed current solarEnvelope2 and solarFan2 to avoid conflicts.