Cleanup api; use buttons for things that are, conceptually, buttons;
Removed test script