Removed lots of old commented code.
Fixed fade incompatible connections to work with new data structure
Took out some view dependent coding in main.js