clean up even more