STORM-1126 WIP Windlight Estate Settings integration: pass 9
STORM-1126 WIP Windlight Estate Settings integration: pass 9

Removed dead code.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm