Removed old code from main code, reordered LW and MW cube lists