Removed bloated code for old datastructure to prepare for implimentation of new product datastructure
Fixes issues with views caused by removing the datastructure bloat
more refactoring for new datastructure
update from master