Cleanup auth interface. Closes #1288