clean up more stuff