removed TODO stubs, removed dangling output for exception class