Merge "remove shadow related references"