GPII-596: Removed some comments and using that.locate() directly.
GPII-596: Added a TODO related to 
http://issues.fluidproject.org/browse/FLUID-5278