final cleanup i hope