final cleanup before PR