Code cleanup

Left the timer in place. Fixed some minor details in the test
applications.