Remove older unused code, and a bit of whote-space cleanup.
Call civicrm-api as uid 1.