Merge "Remove unneeded code"