Resolved Global Update issues
Resolved Resource Location issues
Removed unused code and imports