Heavy cleanup, examples, removing old test code