hopefully final cleanup