world code fixes
Merge remote-tracking branch 'origin/LinusBranch'
Removed unused resources
view code fixes
Merge remote-tracking branch 'origin/LinusBranch'
Merge remote-tracking branch 'origin/CallebergBranch'