Refactoring & removing redundant resources (2.0.7.309)