hopefully the final cleanup