Redundant method commented
UI development started
merge from server