Cleanup.

This also fixes a bug (the url module is logged). One of many.