cleaning up unused stuff, and some more responsiveness