Fix rotated shadow
More cleanup