LOW : Removed useless code
LOW : some cleanup
MEDIUM : Attempt to fix issues with Resource Location