Merge "Bug 4957 Clean unnecessary code"