Milestone 1.8.1 Commits: Removal of unused resource entries.