remove unused columns/options..
undo commit all side effect..
Merge branch 'topic/solgs_integration_2' into topic/prediction_section_combo_pops