Merge "Removing unused code"