interim commit
merged out
added cleanup after subhandler closes