Cleanup interface
Cleanup interface, added test, removed old examples