Feature/pdsc 4 refactor ui code harvest

Does these commented code used in later or not ?