Clean up properly.
Add dependency on python-six.