final cleanup, ready to merge