final cleanup (i hope)