Remove useless uvmapping
Add workaround for broken core line of sight