Remove, too pushy.
Code cleanup.
Prevent response clashes. Fixes #8.