remove method finish
simplify exit handler