Moved api call into alpabetical order.
Moved api call into alpabetical order.

Removed some stale code.

CelliesProjects/aquacontrol32,CelliesProjects/aquacontrol32,CelliesProjects/aquacontrol32,CelliesProjects/aquacontrol32