Merge "Redundant code removal and hadrcoded strings"