Merge "Removed some unused resources" into jb-dev