general cleanup
remove unnecessary finally