final cleanup pr138