code optimisation and clean up
Deleted ResLocHelper