Merge "Remove unused shadow"