Correcting demand profile resolve reference name and getting rid of unused functionality.