add final cleanup