deleted unused code. fixed saving bug
Merge remote-tracking branch 'origin/Major-Refactored' into Major-Refactored