some final cleanup