Merge "Removal of useless code"