Cleanup of obsolete stuff
Some responsiveness