Merge "removing unnecessary/dead code"