CRAY - remove unneeded functionality.
Minor formatting change.
Fix warnings on a non-cray system
CRAY - fix memory issue with task/cray plugin